From 286b5b9b724339ec7e8cb1990fe7fafce3b9f172 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 12 Apr 2011 01:50:07 +0200
Subject: [PATCH] cssprovider: Don't fail if an import doesn't work

---
 gtk/gtkcssprovider.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 71c1deba08..d50ce27602 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -2239,7 +2239,6 @@ parse_rule (GtkCssProvider  *css_provider,
         }
       else if (strcmp (directive, "import") == 0)
         {
-          gboolean loaded;
           gchar *path = NULL;
           GFile *actual;
           GError *error = NULL;
@@ -2279,17 +2278,14 @@ parse_rule (GtkCssProvider  *css_provider,
             }
 
           /* FIXME: Avoid recursive importing */
-          loaded = gtk_css_provider_load_internal (css_provider,
-                                                   actual,
-                                                   NULL, 0,
-                                                   NULL);
+          gtk_css_provider_load_internal (css_provider,
+                                          actual,
+                                          NULL, 0,
+                                          NULL);
 
           g_object_unref (actual);
 
-          if (!loaded)
-            return G_TOKEN_IDENTIFIER;
-          else
-            return G_TOKEN_NONE;
+          return G_TOKEN_NONE;
         }
       else if (strcmp (directive, "binding-set") == 0)
         {
-- 
2.30.2